From b8eaa63001fcbc2869e59b30725b93dd1674bc33 Mon Sep 17 00:00:00 2001 From: Sven Luther Date: Thu, 15 Jul 2004 07:43:15 +0000 Subject: [PATCH] Added bug closing changelog entries. # Cleaned up overrides. # Added amd64 native code built support. # Fixed non native code supporting arches build. --- debian/changelog | 12 +++- debian/control | 2 +- debian/ocaml-base-nox.dirs | 1 - debian/ocaml-base.dirs | 2 +- debian/ocaml-base.override | 3 + debian/ocaml-base.postinst | 2 + debian/ocaml-base.prerm | 2 +- debian/ocaml-native-compilers.dirs | 1 - debian/ocaml-native-compilers.override | 0 debian/ocaml-nox.override | 81 ++++++++++++++++++++++++++ debian/ocaml-nox.prerm | 2 +- debian/ocaml-opt.files | 11 ++++ debian/ocaml-source.dirs | 1 - debian/ocaml-source.override | 0 debian/ocaml.override | 0 debian/ocaml.postinst | 2 + debian/ocaml.prerm | 2 +- debian/rules | 20 +++---- 18 files changed, 122 insertions(+), 22 deletions(-) create mode 100644 debian/ocaml-base.override delete mode 100644 debian/ocaml-native-compilers.override create mode 100644 debian/ocaml-opt.files delete mode 100644 debian/ocaml-source.override delete mode 100644 debian/ocaml.override diff --git a/debian/changelog b/debian/changelog index c2589469..968792e3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,12 +1,18 @@ ocaml (3.08.0-1) unstable; urgency=low * New upstream release. + * Do not install the emacs files, until upstream gives a response about the + licencing issue. (Closes: #227159, #227163) + * Fix non-native compiler supporting arches build. (Closes: #259261) + * Added amd64 native code compilers build. (Closes: #248334) + * Now include the nums package again, since 3.08 include the new free + version. (Clsoes: #240902) + * Now include ocamldoc manpage. (Clsoes: #255239) - -- Sven Luther Wed, 14 Jul 2004 15:09:32 +0200 + -- Sven Luther Thu, 15 Jul 2004 09:21:55 +0200 ocaml (3.07.2a-5) unstable; urgency=low - * Added amd64 native code compilers build. -- Sven Luther Mon, 12 Jul 2004 12:06:33 +0200 @@ -299,7 +305,7 @@ ocaml (3.06-4) unstable; urgency=high ocaml (3.06-3) unstable; urgency=high * Added a Provide: ocaml-source-3.06 to the ocaml-source control file. - (Asked by Jérôme Marant) + (Asked by Jerome Marant) -- Sven Luther Fri, 30 Aug 2002 09:39:25 +0200 diff --git a/debian/control b/debian/control index 50e56bee..4cbff003 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: devel Priority: optional Maintainer: Sven Luther Build-Depends: debhelper (>> 4.0.2), tcl8.4-dev, tk8.4-dev, libncurses5-dev, libgdbm-dev, dpatch, bzip2 -Standards-Version: 3.6.0 +Standards-Version: 3.6.1 Package: ocaml-nox Architecture: any diff --git a/debian/ocaml-base-nox.dirs b/debian/ocaml-base-nox.dirs index 0e5f2e6b..36ad867e 100644 --- a/debian/ocaml-base-nox.dirs +++ b/debian/ocaml-base-nox.dirs @@ -2,4 +2,3 @@ usr/bin usr/share/man/man1 usr/lib/ocaml/3.08 usr/lib/ocaml/3.08/stublibs -usr/share/lintian/overrides diff --git a/debian/ocaml-base.dirs b/debian/ocaml-base.dirs index 92e83301..95024d80 100644 --- a/debian/ocaml-base.dirs +++ b/debian/ocaml-base.dirs @@ -1,2 +1,2 @@ usr/lib/ocaml/3.08/stublibs - +usr/share/lintian/overrides diff --git a/debian/ocaml-base.override b/debian/ocaml-base.override new file mode 100644 index 00000000..09367719 --- /dev/null +++ b/debian/ocaml-base.override @@ -0,0 +1,3 @@ +binary-or-shlib-defines-rpath ./usr/lib/ocaml/3.08/stublibs/dllgraphics.so /usr/X11R6/lib +binary-or-shlib-defines-rpath ./usr/lib/ocaml/3.08/stublibs/dlllabltk.so /usr/lib:/usr/X11R6/lib +binary-or-shlib-defines-rpath ./usr/lib/ocaml/3.08/stublibs/dlltkanim.so /usr/lib:/usr/X11R6/lib diff --git a/debian/ocaml-base.postinst b/debian/ocaml-base.postinst index a24f94fb..8c606d9b 100644 --- a/debian/ocaml-base.postinst +++ b/debian/ocaml-base.postinst @@ -3,3 +3,5 @@ ln -sf ../ocaml-base-nox/Changes.gz /usr/share/doc/ocaml-base ln -sf ../ocaml-base-nox/README.gz /usr/share/doc/ocaml-base ln -sf ../ocaml-base-nox/ocaml_packaging_policy.gz /usr/share/doc/ocaml-base + +#DEBHELPER# diff --git a/debian/ocaml-base.prerm b/debian/ocaml-base.prerm index 1c54991d..af5b9e97 100644 --- a/debian/ocaml-base.prerm +++ b/debian/ocaml-base.prerm @@ -4,4 +4,4 @@ rm -f /usr/share/doc/ocaml-base/Changes.gz rm -f /usr/share/doc/ocaml-base/README.gz rm -f /usr/share/doc/ocaml-base/ocaml_packaging_policy.gz - +#DEBHELPER# diff --git a/debian/ocaml-native-compilers.dirs b/debian/ocaml-native-compilers.dirs index 277c20b1..98d15831 100644 --- a/debian/ocaml-native-compilers.dirs +++ b/debian/ocaml-native-compilers.dirs @@ -1,3 +1,2 @@ usr/bin usr/share/man/man1 -usr/share/lintian/overrides diff --git a/debian/ocaml-native-compilers.override b/debian/ocaml-native-compilers.override deleted file mode 100644 index e69de29b..00000000 diff --git a/debian/ocaml-nox.override b/debian/ocaml-nox.override index e69de29b..6947cc49 100644 --- a/debian/ocaml-nox.override +++ b/debian/ocaml-nox.override @@ -0,0 +1,81 @@ +manpage-section-mismatch usr/share/man/man3/ArrayLabels.3o.gz:1 3o != ArrayLabels +manpage-section-mismatch usr/share/man/man3/Bigarray.3o.gz:1 3o != Bigarray +manpage-section-mismatch usr/share/man/man3/Bigarray.Array2.3o.gz:1 3o != Bigarray.Array2 +manpage-section-mismatch usr/share/man/man3/Bigarray.Array3.3o.gz:1 3o != Bigarray.Array3 +manpage-section-mismatch usr/share/man/man3/Bigarray.Genarray.3o.gz:1 3o != Bigarray.Genarray +manpage-section-mismatch usr/share/man/man3/Buffer.3o.gz:1 3o != Buffer +manpage-section-mismatch usr/share/man/man3/Callback.3o.gz:1 3o != Callback +manpage-section-mismatch usr/share/man/man3/CamlinternalOO.3o.gz:1 3o != CamlinternalOO +manpage-section-mismatch usr/share/man/man3/Char.3o.gz:1 3o != Char +manpage-section-mismatch usr/share/man/man3/Complex.3o.gz:1 3o != Complex +manpage-section-mismatch usr/share/man/man3/Digest.3o.gz:1 3o != Digest +manpage-section-mismatch usr/share/man/man3/Filename.3o.gz:1 3o != Filename +manpage-section-mismatch usr/share/man/man3/Format.3o.gz:1 3o != Format +manpage-section-mismatch usr/share/man/man3/Gc.3o.gz:1 3o != Gc +manpage-section-mismatch usr/share/man/man3/Genlex.3o.gz:1 3o != Genlex +manpage-section-mismatch usr/share/man/man3/Hashtbl.3o.gz:1 3o != Hashtbl +manpage-section-mismatch usr/share/man/man3/Hashtbl.Make.3o.gz:1 3o != Hashtbl.Make +manpage-section-mismatch usr/share/man/man3/Hashtbl.S.3o.gz:1 3o != Hashtbl.S +manpage-section-mismatch usr/share/man/man3/Int32.3o.gz:1 3o != Int32 +manpage-section-mismatch usr/share/man/man3/Int64.3o.gz:1 3o != Int64 +manpage-section-mismatch usr/share/man/man3/Lazy.3o.gz:1 3o != Lazy +manpage-section-mismatch usr/share/man/man3/Lexing.3o.gz:1 3o != Lexing +manpage-section-mismatch usr/share/man/man3/List.3o.gz:1 3o != List +manpage-section-mismatch usr/share/man/man3/ListLabels.3o.gz:1 3o != ListLabels +manpage-section-mismatch usr/share/man/man3/Map.3o.gz:1 3o != Map +manpage-section-mismatch usr/share/man/man3/Map.Make.3o.gz:1 3o != Map.Make +manpage-section-mismatch usr/share/man/man3/Map.S.3o.gz:1 3o != Map.S +manpage-section-mismatch usr/share/man/man3/Marshal.3o.gz:1 3o != Marshal +manpage-section-mismatch usr/share/man/man3/MoreLabels.3o.gz:1 3o != MoreLabels +manpage-section-mismatch usr/share/man/man3/MoreLabels.Hashtbl.3o.gz:1 3o != MoreLabels.Hashtbl +manpage-section-mismatch usr/share/man/man3/MoreLabels.Hashtbl.Make.3o.gz:1 3o != MoreLabels.Hashtbl.Make +manpage-section-mismatch usr/share/man/man3/MoreLabels.Hashtbl.S.3o.gz:1 3o != MoreLabels.Hashtbl.S +manpage-section-mismatch usr/share/man/man3/MoreLabels.Map.3o.gz:1 3o != MoreLabels.Map +manpage-section-mismatch usr/share/man/man3/MoreLabels.Map.Make.3o.gz:1 3o != MoreLabels.Map.Make +manpage-section-mismatch usr/share/man/man3/MoreLabels.Map.OrderedType.3o.gz:1 3o != MoreLabels.Map.OrderedType +manpage-section-mismatch usr/share/man/man3/MoreLabels.Map.S.3o.gz:1 3o != MoreLabels.Map.S +manpage-section-mismatch usr/share/man/man3/MoreLabels.Set.3o.gz:1 3o != MoreLabels.Set +manpage-section-mismatch usr/share/man/man3/MoreLabels.Set.Make.3o.gz:1 3o != MoreLabels.Set.Make +manpage-section-mismatch usr/share/man/man3/MoreLabels.Set.OrderedType.3o.gz:1 3o != MoreLabels.Set.OrderedType +manpage-section-mismatch usr/share/man/man3/MoreLabels.Set.S.3o.gz:1 3o != MoreLabels.Set.S +manpage-section-mismatch usr/share/man/man3/Nativeint.3o.gz:1 3o != Nativeint +manpage-section-mismatch usr/share/man/man3/Num.3o.gz:1 3o != Num +manpage-section-mismatch usr/share/man/man3/Obj.3o.gz:1 3o != Obj +manpage-section-mismatch usr/share/man/man3/Oo.3o.gz:1 3o != Oo +manpage-section-mismatch usr/share/man/man3/Parsing.3o.gz:1 3o != Parsing +manpage-section-mismatch usr/share/man/man3/Pervasives.3o.gz:1 3o != Pervasives +manpage-section-mismatch usr/share/man/man3/Pervasives.LargeFile.3o.gz:1 3o != Pervasives.LargeFile +manpage-section-mismatch usr/share/man/man3/Printexc.3o.gz:1 3o != Printexc +manpage-section-mismatch usr/share/man/man3/Printf.3o.gz:1 3o != Printf +manpage-section-mismatch usr/share/man/man3/Queue.3o.gz:1 3o != Queue +manpage-section-mismatch usr/share/man/man3/Random.3o.gz:1 3o != Random +manpage-section-mismatch usr/share/man/man3/Random.State.3o.gz:1 3o != Random.State +manpage-section-mismatch usr/share/man/man3/Scanf.3o.gz:1 3o != Scanf +manpage-section-mismatch usr/share/man/man3/Set.3o.gz:1 3o != Set +manpage-section-mismatch usr/share/man/man3/Set.Make.3o.gz:1 3o != Set.Make +manpage-section-mismatch usr/share/man/man3/Set.OrderedType.3o.gz:1 3o != Set.OrderedType +manpage-section-mismatch usr/share/man/man3/Set.S.3o.gz:1 3o != Set.S +manpage-section-mismatch usr/share/man/man3/Sort.3o.gz:1 3o != Sort +manpage-section-mismatch usr/share/man/man3/Stack.3o.gz:1 3o != Stack +manpage-section-mismatch usr/share/man/man3/StdLabels.3o.gz:1 3o != StdLabels +manpage-section-mismatch usr/share/man/man3/StdLabels.List.3o.gz:1 3o != StdLabels.List +manpage-section-mismatch usr/share/man/man3/StdLabels.String.3o.gz:1 3o != StdLabels.String +manpage-section-mismatch usr/share/man/man3/Str.3o.gz:1 3o != Str +manpage-section-mismatch usr/share/man/man3/Stream.3o.gz:1 3o != Stream +manpage-section-mismatch usr/share/man/man3/String.3o.gz:1 3o != String +manpage-section-mismatch usr/share/man/man3/StringLabels.3o.gz:1 3o != StringLabels +manpage-section-mismatch usr/share/man/man3/Sys.3o.gz:1 3o != Sys +manpage-section-mismatch usr/share/man/man3/Unix.3o.gz:1 3o != Unix +manpage-section-mismatch usr/share/man/man3/Unix.LargeFile.3o.gz:1 3o != Unix.LargeFile +manpage-section-mismatch usr/share/man/man3/Weak.3o.gz:1 3o != Weak +manpage-section-mismatch usr/share/man/man3/Weak.Make.3o.gz:1 3o != Weak.Make +manpage-section-mismatch usr/share/man/man3/Weak.S.3o.gz:1 3o != Weak.S +manpage-section-mismatch usr/share/man/man3/Arg.3o.gz:1 3o != Arg +manpage-section-mismatch usr/share/man/man3/Array.3o.gz:1 3o != Array +manpage-section-mismatch usr/share/man/man3/Bigarray.Array1.3o.gz:1 3o != Bigarray.Array1 +manpage-section-mismatch usr/share/man/man3/Hashtbl.HashedType.3o.gz:1 3o != Hashtbl.HashedType +manpage-section-mismatch usr/share/man/man3/Map.OrderedType.3o.gz:1 3o != Map.OrderedType +manpage-section-mismatch usr/share/man/man3/MoreLabels.Hashtbl.HashedType.3o.gz:1 3o != MoreLabels.Hashtbl.HashedType +manpage-section-mismatch usr/share/man/man3/Scanf.Scanning.3o.gz:1 3o != Scanf.Scanning +manpage-section-mismatch usr/share/man/man3/StdLabels.Array.3o.gz:1 3o != StdLabels.Array +script-not-executable ./usr/lib/ocaml/3.08/camlheader diff --git a/debian/ocaml-nox.prerm b/debian/ocaml-nox.prerm index 0fa967a2..648ab8e3 100644 --- a/debian/ocaml-nox.prerm +++ b/debian/ocaml-nox.prerm @@ -4,4 +4,4 @@ rm -f /usr/share/doc/ocaml-nox/Changes.gz rm -f /usr/share/doc/ocaml-nox/README.gz rm -f /usr/share/doc/ocaml-nox/ocaml_packaging_policy.gz - +#DEBHELPER# diff --git a/debian/ocaml-opt.files b/debian/ocaml-opt.files new file mode 100644 index 00000000..0d17945d --- /dev/null +++ b/debian/ocaml-opt.files @@ -0,0 +1,11 @@ +usr/bin/labltk +usr/lib/ocaml/3.08/libgraphics.a +usr/lib/ocaml/3.08/graphics.cma +usr/lib/ocaml/3.08/graphics.cmi +usr/lib/ocaml/3.08/graphicsX11.cmi +usr/lib/ocaml/3.08/graphics.mli +usr/lib/ocaml/3.08/graphicsX11.mli +usr/lib/ocaml/3.08/labltk +usr/lib/ocaml/3.08/graphics.cmx +usr/lib/ocaml/3.08/graphics.cmxa +usr/lib/ocaml/3.08/graphics.a diff --git a/debian/ocaml-source.dirs b/debian/ocaml-source.dirs index 0429ce68..1abb1ad6 100644 --- a/debian/ocaml-source.dirs +++ b/debian/ocaml-source.dirs @@ -1,2 +1 @@ usr/src/ocaml/ocaml-3.08 -usr/share/lintian/overrides diff --git a/debian/ocaml-source.override b/debian/ocaml-source.override deleted file mode 100644 index e69de29b..00000000 diff --git a/debian/ocaml.override b/debian/ocaml.override deleted file mode 100644 index e69de29b..00000000 diff --git a/debian/ocaml.postinst b/debian/ocaml.postinst index a24f94fb..8c606d9b 100644 --- a/debian/ocaml.postinst +++ b/debian/ocaml.postinst @@ -3,3 +3,5 @@ ln -sf ../ocaml-base-nox/Changes.gz /usr/share/doc/ocaml-base ln -sf ../ocaml-base-nox/README.gz /usr/share/doc/ocaml-base ln -sf ../ocaml-base-nox/ocaml_packaging_policy.gz /usr/share/doc/ocaml-base + +#DEBHELPER# diff --git a/debian/ocaml.prerm b/debian/ocaml.prerm index ed58b545..d0819f3f 100644 --- a/debian/ocaml.prerm +++ b/debian/ocaml.prerm @@ -4,4 +4,4 @@ rm -f /usr/share/doc/ocaml/Changes.gz rm -f /usr/share/doc/ocaml/README.gz rm -f /usr/share/doc/ocaml/ocaml_packaging_policy.gz - +#DEBHELPER# diff --git a/debian/rules b/debian/rules index bd430b24..518667b5 100755 --- a/debian/rules +++ b/debian/rules @@ -87,7 +87,7 @@ clean: unpatch rm -rf boot; \ mv boot.debian boot; \ fi - -$(MAKE) -C emacs clean + #-$(MAKE) -C emacs clean ifneq "$(wildcard /usr/share/misc/config.sub)" "" cp -f /usr/share/misc/config.sub config/gnu/config.sub endif @@ -128,15 +128,15 @@ install-arch: # Let's install ocaml first. $(MAKE) install PREFIX=$(CURDIR)/debian/ocaml-nox/usr - $(MAKE) -C emacs EMACSDIR=$(CURDIR)/debian/ocaml-nox/usr/share/emacs/site-lisp/ocaml \ + #$(MAKE) -C emacs EMACSDIR=$(CURDIR)/debian/ocaml-nox/usr/share/emacs/site-lisp/ocaml \ NOCOMPILE=true simple-install - $(MAKE) -C emacs SCRIPTDIR=$(CURDIR)/debian/ocaml-nox/usr/bin install-ocamltags + #$(MAKE) -C emacs SCRIPTDIR=$(CURDIR)/debian/ocaml-nox/usr/bin install-ocamltags install -m 644 debian/JoeCaml.xpm \ $(CURDIR)/debian/ocaml-nox/usr/X11R6/include/X11/pixmaps install -m 644 debian/ocaml-nox.override \ $(CURDIR)/debian/ocaml-nox/usr/share/lintian/overrides/ocaml-nox - install -m 644 debian/ocaml.override \ - $(CURDIR)/debian/ocaml-nox/usr/share/lintian/overrides/ocaml + install -m 644 debian/ocaml-base.override \ + $(CURDIR)/debian/ocaml-nox/usr/share/lintian/overrides/ocaml-base install -m 644 otherlibs/labltk/README \ $(CURDIR)/debian/README.labltk install -m 644 config/Makefile \ @@ -145,11 +145,11 @@ install-arch: # now move the graphics files over if [ -e opt-built-stamp ]; then \ dh_movefiles -pocaml \ - --sourcedir=debian/ocaml-nox; \ + --sourcedir=debian/ocaml-nox \ + `cat ocaml-opt.files`; else \ dh_movefiles -pocaml \ - --sourcedir=debian/ocaml-nox \ - --exclude=*.cmx --exclude=*.cmxa; \ + --sourcedir=debian/ocaml-nox; \ fi @@ -165,8 +165,6 @@ install-arch: if [ -e opt-built-stamp ]; then \ dh_movefiles -pocaml-native-compilers \ --sourcedir=debian/ocaml-nox; \ - install -m 644 debian/ocaml-native-compilers.override \ - $(CURDIR)/debian/ocaml-native-compilers/usr/share/lintian/overrides/ocaml-native-compilers; \ fi # The interpreter files @@ -194,7 +192,7 @@ binary-common: # dh_installmenu # dh_installdebconf # dh_installlogrotate - dh_installemacsen +# dh_installemacsen # dh_installpam # dh_installmime # dh_installinit -- 2.30.2